*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 57e39ddc3d829a0a03cb556d58b6eae7d0a6fdc2..1d9ed979aba4a354bf230a8fad44c00552d59057 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -280,6 +280,9 @@ SQL buffer.
 \f
 * Lisp Changes in Emacs 21.3
 
+** If text has a `keymap' property, that keymap takes precedence
+over minor mode keymaps.
+
 ** A hex escape in a string forces the string to be multibyte.
 An octal escape makes it unibyte.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index e0ffe90c5946abed0862a928df2cae2f2b6cf337..2693da95d88973fc5529007a99f26a3784bc25c0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-02  Richard M. Stallman  <rms@gnu.org>
 
+       * keyboard.c (read_key_sequence): Handle the keymap property
+       before minor mode maps.
+
        * editfns.c (Fformat): Update thissize from field_width
        based on the actual width, in the string case.